298806c50bc9313582eae04389717621f74cc4d4,plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/SimplifyIfElsePredicate.java,SimplifyIfElsePredicate,isSimplifiableImplicitAssignment,#PsiIfStatement#,182

Before Change



    public static boolean isSimplifiableImplicitAssignment(
            PsiIfStatement ifStatement){
        if(ifStatement.getElseBranch() != null){
            return false;
        }
        PsiStatement thenBranch = ifStatement.getThenBranch();
        thenBranch = ConditionalUtils.stripBraces(thenBranch);
        final PsiElement nextStatement =
                PsiTreeUtil.skipSiblingsBackward(ifStatement,
                        PsiWhiteSpace.class);
        if(!(nextStatement instanceof PsiStatement)){
            return false;
        }
        PsiStatement elseBranch = (PsiStatement) nextStatement;
        elseBranch = ConditionalUtils.stripBraces(elseBranch);
        if(ConditionalUtils.isAssignment(thenBranch, "true") &&
                ConditionalUtils.isAssignment(elseBranch, "false")){
            final PsiAssignmentExpression thenExpression =
                    (PsiAssignmentExpression)
                            ((PsiExpressionStatement) thenBranch).getExpression();

After Change



    public static boolean isSimplifiableImplicitAssignment(
            PsiIfStatement ifStatement){
        if(ifStatement.getElseBranch() != null){
            return false;
        }
        PsiStatement thenBranch = ifStatement.getThenBranch();
        thenBranch = ConditionalUtils.stripBraces(thenBranch);
        final PsiElement previousStatement =
                PsiTreeUtil.skipSiblingsBackward(ifStatement,
                        PsiWhiteSpace.class);
        if(!(previousStatement instanceof PsiStatement)){
            return false;
        }
        PsiStatement elseBranch = (PsiStatement) previousStatement;
        elseBranch = ConditionalUtils.stripBraces(elseBranch);
        if(!ConditionalUtils.isAssignment(thenBranch, "true") ||
                !ConditionalUtils.isAssignment(elseBranch, "false")){
            return false;
        }
        final PsiAssignmentExpression thenExpression =